Set double quote as enclosing character by default. Regenerate reference data.

diff --git a/gpsbabel/reference/unicsv.gpx b/gpsbabel/reference/unicsv.gpx
index b52cbe77e732f5caa3b3285e7607b111b663153e..08f4ffedf2c53da11b3f0da78ae93fcad7c40520 100644 (file)
--- a/gpsbabel/reference/unicsv.gpx
+++ b/gpsbabel/reference/unicsv.gpx
@@ -8,48 +8,48 @@ xsi:schemaLocation="http://www.topografix.com/GPX/1/0 http://www.topografix.com/
 <time>1970-01-01T00:00:00Z</time>
 <bounds minlat="35.972030000" minlon ="-87.134700000" maxlat="36.112180000" maxlon="-86.620120000" />
 <wpt lat="35.972030000" lon="-87.134700000">
-  <name> &quot;GCEBB&quot;</name>
-  <cmt> &quot;Mountain Bike Heaven by susy1313&quot;</cmt>
-  <desc> &quot;Mountain Bike Heaven by susy1313&quot;</desc>
+  <name>GCEBB</name>
+  <cmt>Mountain Bike Heaven by susy1313</cmt>
+  <desc>Mountain Bike Heaven by susy1313</desc>
 </wpt>
 <wpt lat="36.090680000" lon="-86.679550000">
-  <name> &quot;GC1A37&quot;</name>
-  <cmt> &quot;The Troll by a182pilot &amp; Family&quot;</cmt>
-  <desc> &quot;The Troll by a182pilot &amp; Family&quot;</desc>
+  <name>GC1A37</name>
+  <cmt>The Troll by a182pilot &amp; Family</cmt>
+  <desc>The Troll by a182pilot &amp; Family</desc>
 </wpt>
 <wpt lat="35.996270000" lon="-86.620120000">
-  <name> &quot;GC1C2B&quot;</name>
-  <cmt> &quot;Dive Bomber by JoGPS &amp; family&quot;</cmt>
-  <desc> &quot;Dive Bomber by JoGPS &amp; family&quot;</desc>
+  <name>GC1C2B</name>
+  <cmt>Dive Bomber by JoGPS &amp; family</cmt>
+  <desc>Dive Bomber by JoGPS &amp; family</desc>
 </wpt>
 <wpt lat="36.038480000" lon="-86.648620000">
-  <name> &quot;GC25A9&quot;</name>
-  <cmt> &quot;FOSTER by JoGPS &amp; Family&quot;</cmt>
-  <desc> &quot;FOSTER by JoGPS &amp; Family&quot;</desc>
+  <name>GC25A9</name>
+  <cmt>FOSTER by JoGPS &amp; Family</cmt>
+  <desc>FOSTER by JoGPS &amp; Family</desc>
 </wpt>
 <wpt lat="36.112180000" lon="-86.741770000">
-  <name> &quot;GC2723&quot;</name>
-  <cmt> &quot;Logan Lighthouse by JoGps &amp; Family&quot;</cmt>
-  <desc> &quot;Logan Lighthouse by JoGps &amp; Family&quot;</desc>
+  <name>GC2723</name>
+  <cmt>Logan Lighthouse by JoGps &amp; Family</cmt>
+  <desc>Logan Lighthouse by JoGps &amp; Family</desc>
 </wpt>
 <wpt lat="36.064080000" lon="-86.790520000">
-  <name> &quot;GC2B71&quot;</name>
-  <cmt> &quot;Ganier Cache by Susy1313&quot;</cmt>
-  <desc> &quot;Ganier Cache by Susy1313&quot;</desc>
+  <name>GC2B71</name>
+  <cmt>Ganier Cache by Susy1313</cmt>
+  <desc>Ganier Cache by Susy1313</desc>
 </wpt>
 <wpt lat="36.087770000" lon="-86.809730000">
-  <name> &quot;GC309F&quot;</name>
-  <cmt> &quot;Shy&apos;s Hill by FireFighterEng33&quot;</cmt>
-  <desc> &quot;Shy&apos;s Hill by FireFighterEng33&quot;</desc>
+  <name>GC309F</name>
+  <cmt>Shy&apos;s Hill by FireFighterEng33</cmt>
+  <desc>Shy&apos;s Hill by FireFighterEng33</desc>
 </wpt>
 <wpt lat="36.057500000" lon="-86.892000000">
-  <name> &quot;GC317A&quot;</name>
-  <cmt> &quot;GittyUp by JoGPS / Warner Parks&quot;</cmt>
-  <desc> &quot;GittyUp by JoGPS / Warner Parks&quot;</desc>
+  <name>GC317A</name>
+  <cmt>GittyUp by JoGPS / Warner Parks</cmt>
+  <desc>GittyUp by JoGPS / Warner Parks</desc>
 </wpt>
 <wpt lat="36.082800000" lon="-86.867280000">
-  <name> &quot;GC317D&quot;</name>
-  <cmt> &quot;Inlighting by JoGPS / Warner Parks&quot;</cmt>
-  <desc> &quot;Inlighting by JoGPS / Warner Parks&quot;</desc>
+  <name>GC317D</name>
+  <cmt>Inlighting by JoGPS / Warner Parks</cmt>
+  <desc>Inlighting by JoGPS / Warner Parks</desc>
 </wpt>
 </gpx>

diff --git a/gpsbabel/unicsv.c b/gpsbabel/unicsv.c
index eb09a748601886f4018d630293096a87759962dd..46220691a370300751beb52d94184d09ec74f2d9 100644 (file)
--- a/gpsbabel/unicsv.c
+++ b/gpsbabel/unicsv.c
@@ -167,12 +167,12 @@ unicsv_parse_one_line(char *ibuf)
        double utme;
        double utmn;
 
-       s = csv_lineparse(ibuf, unicsv_fieldsep, "", 0);
+       s = csv_lineparse(ibuf, unicsv_fieldsep, "\"", 0);
        if (s == NULL) return;
        
        wpt = waypt_new();
 
-       for (i=0; s; i++, s = csv_lineparse(NULL, unicsv_fieldsep, "", 0)) {
+       for (i=0; s; i++, s = csv_lineparse(NULL, unicsv_fieldsep, "\"", 0)) {
                if (i == unicsv_fieldpos.latcol) {
                        human_to_dec( s, &wpt->latitude, &wpt->longitude, 1 );
                }